Remove .user from git
Merge