implemented annotation conflict resolution
refactoring