removed merge artifacts