Resolved file out of sync resulting from a direct commit to master