resolved xcode merge conflict
Commit again locally
Merged with Will