move merge conflict and start README