Fixed commmit conflict