remove merge diff line from bottom of user model file