making a conflict in git with Geordi