Removed conflicts manually
merged