Wrapped location message correctly
Fix merge conflict