Removed bad merge artifacts