Removed conflict error
Revert d6b242a..c354f2c

This rolls back to commit d6b242a91940ebc0056ba1133439afd2c129f4b3.