I used meld during the merge. Reformatting it with IDE.