removed merge hassle