merged conflicts
minor changes