fixed silly merge artifacts