actually merged properly now