Fixed conflict which broke shit