Removed conflicts thing