fixes and resolving conflicts