fixed conflict in my sprint 3