Untracking and ignoring tmp files
Fixing merge conflict with wp-content/cache files