Getting ready for the merge hell... I mean caping the texts
merging conflict