Commit before merging
Fixed database merge conflict