fixed merged conflicts ( i think )