Clean up file permissions and merge conflict markers