Conflict resolution

conflict.merge.txt contains the weird conflict stuffs…