Removed stuff from conflict