You need to remove merge conflict things.Also, make sure your code builds before you push. If your code doesn't build note that in the commit comment.