Schema added
Git merge conflict