ADD line 5 conflict