removed merge artifacts

also weird lint rule activated? weird