year detection v1
fix conflict