adding functionality to main project
resolving conflicts