Mengatasi Git Conflict

Ada kasus bentrok / conflict git. Solusinya dapet di sini:
http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git

Begini prakteknya