Remove conflicting lines

Please merge me.