refactoring
merged confiliction.