Issue #52, repair conflict and add a condition in view