fix: remove merge artefact

Change-Id: Idf4c4c6193eb38449ef73cfb736520dcefca0e67