dont break the chain
all conflicts fixed