Idk
Fixed merge conflict, null pointer exception fixed