Eliminated all parse conflicts apart from '-'