you still have a conflict here. 

Make sure you don't have any conflict first then push it again