changes to allow merge