Adding at the end of files is a guaranteed merge conflict. Change-Id: I6dceb8fb0ad95c54940c55a023eb9eb088b5ea16