Sorry, didnt remove the conflict resolution messages from commit; fixed now :)