corne@PonyPark:~/Development/PerformanceTool$ git merge profiles
Auto-merging src/info/corne/performancetool/activities/CPUSettingsActivity.java
Auto-merging src/info/corne/performancetool/activities/AdvancedSettingsActivity.java
Auto-merging src/info/corne/performancetool/MainActivity.java
CONFLICT (content): Merge conflict in src/info/corne/performancetool/MainActivity.java
Auto-merging src/info/corne/performancetool/BootService.java
CONFLICT (content): Merge conflict in src/info/corne/performancetool/BootService.java
Auto-merging res/values/strings.xml
CONFLICT (content): Merge conflict in res/values/strings.xml
Automatic merge failed; fix conflicts and then commit the result.