Fixed weird stuff happened on a conflict

Sorry, poor experience on Git :P