Why would there be a conflict? Git will take care of merging this for us.