fixed report view after git conflict