Bye-bye
Fixed conflicts in main.c