Commit in master
Resolve conflict