conflict resolved.

merge some_changes to master