merging conflict is solved
merging conflict is solved
logo updated