All tests pass
 Merge conflcts fixed