Update conflict

This post should solve your issue.