Cleaned up a dirty merge