stuff
to stop pushing .o files
merge conflict resolve