Resolution bugs
Resolution bugs merge