*
remove .o
merge conflict