Fixed a highly inneficient bug in the coordinator
merge