Fixed NullPointerException
Resolved conflict