removed conflicting lines