fixed files that were damaged by merge with server