FIXING merge conflicts