Adding feature to do something while waiting on a merge