Removed some merge artifacts