Fixed Merge issues caused by bad pull