Fixed merge issues, going to remerge