Removed merge conflicts on all README