Solved conflicts between local branch and master (latest changes)