Conflict Resloved. #59