Makefile updated merge conflict solved by rollback