resolving merge conflict patrick->master