still trying to get rid of merge artifacts