merged
revised the conflects