colin made changes
fixed merge conflict about...