Cleaned up some merge issues