Merge conflict resolution removed the newline in the end of file
This happened on me the third time, and now I finally figured that out.
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11695/diffs#note_30826818
db/schema.rb
is always conflicting if we're updating the version, and resolving it on the web is quite convenient. However, it seems that it's removing the newline in the end of file, causing a new change.