Removed merge issues