Cleaned up some merge reletade things